kakjaj
Merge branch 'master' of https://github.com/lilachoklad/MAPappen

Conflicts:
	readme.txt