Initial commit
Merge branch 'master' of github.com:budic/game-on

Conflicts:
	.gitignore