Change load time to 4 seconds
Refactor socket.js
Merge branch 'dev'
Merge branch 'master' of https://github.com/RebootJeff/phone-tag into dev
Merge branch 'master' of https://github.com/RebootJeff/phone-tag into dev

Conflicts:
	config/socket/game.js
Merge branch 'dev'
Merge pull request #43 from rohaus/master

Refactor socket