blablabal
Merge branch 'master' of https://github.com/olemagnus/tgblocks

Conflicts:
	.gitignore
	public/js/Player.js
	public/style/game.css