c
Merge branch 'master' of https://github.com/yloquen/TextEffects

Conflicts:
	README.md