more ignore fuck
Merge branch 'master' of https://github.com/UniCrapShitStorm/zombiewestern

Conflicts:
	Project/Project.userprefs