Updated back end code
Merge branch 'master' of https://github.com/pavelkang/mhacks