more set up
Merge branch 'master' of https://github.com/Supraluminal/MHacks2103TeamB9Server