Git messed up - try to fix
Merge branch 'master' of https://github.com/Jakky89/cuwo

Conflicts:
	.gitignore