Server socket stuff and database controller
Merge remote-tracking branch 'origin/master' into server
Websockets and database implemented
Merge branch 'master' of github.com:dylanPowers/hackathon2013