Server changes
Merge conflicts
Merge branch 'master' of https://github.com/snnynhr/hackMIT2014