Removed socket server from spinning up
Merge branch 'master' of https://github.com/rperryng/YHack-2014

Conflicts:
	server/server.js