Change name property to playerName and change roomID to gameID
Merge branch 'dev'

Conflicts:
	config/socket/socket.js
Merge pull request #45 from rohaus/master

Change name property to playerName and change roomID to gameID