don't freak out when client refreshes
Merge branch 'master' of github.com:mgaut72/phiMessage