Shifting Tension

When you are around someone who is irritated or angry, instead of joining in the irritation/anger and making it personal, ask him/her how he/she is doing/feeling or how his/her day is going. You'll be surprised how, more often than not, it diffuses the tension. You are giving the other person a "safe" way to release some pent up personal emotion and thus the interaction becomes more positive again.