fix to google hangout issue
Merge branch 'master' of github.com:amylynnb3/Scholars--Hackathon

MErge stuff