lol commit
Merge branch 'master' of https://github.com/josaikko/Jehkuli

Conflicts:
	README.txt