Merge branch 'dev'
Merge branch 'dev'
Merge pull request #43 from rohaus/master

Refactor socket
Implement proximity check for powerups and spawn.
Merge pull request #44 from lkaina/master

Implement proximity check for powerups and spawn.
Merge branch 'dev'

Conflicts:
	config/socket/socket.js