fail in prrogress
Merge branch 'master' of https://github.com/Ariekor/TheWoManProjectII

Conflicts:
	.gitignore