fixing contact
Merge branch 'master' of https://github.com/PSUCapstoneA/firefox-im
fixed Brian's sprint 5 bugs
Merge pull request #94 from liubrian/master

Brian's Sprint 5, bugs fixed.