fix
Merge branch 'master' of https://github.com/danielkurecka/turbo-meme

Conflicts:
	README.md