Many Code
Merge branch 'master' of https://github.com/NikFlip/niks-test-game

Conflicts:
	.gitignore
	bower.json