Test --> Tests in gitignore, added Game, updated Map, added testmap
Merge remote-tracking branch 'jw/master'

Conflicts:
	.gitignore