I don't know

Git ignore is different, need to commit to pull
Merge branch 'master' of https://github.com/Logiant/Castle-Battles

Conflicts:
	bin/.gitignore