It's so hard to manage anger I think for us to calm down we must first give  time to someone and don't forget to talk and fix for what should be the reason for your angriness . Don't let the situation cause more trouble its makes you both feel bad. If the situation is might not easy to fix I think we must need give time to both and let the time comes for you untill you become friends again. Try also to minimize your pride.