larger fb button and mockup logo
Merge branch 'master' of https://github.com/MeganSpeir/Hangouts
resolved merge conflicts
updated git ignore, resolved merge conflicts