asdf
Merge branch 'dev' of https://github.com/yuwilbur/willpeterlike into dev
refactor
Merge branch 'dev' of https://github.com/yuwilbur/willpeterlike into dev

Conflicts:
	src/client/js/Player.js
	src/client/js/game.js
Merge branch 'dev' into feature-bitmapPoly

Conflicts:
	src/client/js/Player.js
	src/client/js/game.js