Server changes
Merge conlicts
Changed generate
Merge branch 'master' of https://github.com/snnynhr/hackMIT2014