initial commit
Merge branch 'master' of https://github.com/britztopher/GridGame

Conflicts:
	.gitignore