ignor
Merge branch 'master' of https://github.com/mental3d/bombermanWaveAI

Conflicts:
	.gitignore