Server working
Merge branch 'master' of https://github.com/demophoon/hackthemidwest2013