reverted coffee
Merge branch 'master' of https://github.com/antofik/Wartech

Conflicts:
	.gitignore