Cool2
Merge branch 'master' of https://github.com/xenondice/Nikmod

Conflicts:
	hey.txt