Small changes
Merging with Destiny's
Merge branch 'master' of https://github.com/cjrieck/HackMIT-Project
Small changes
Got something working pretty well with firebase
Fixing merge