Ok
Merge branch 'master' of https://github.com/angelausy/blue-lotus-crocodiles

Conflicts:
	.gitignore