lalala
Merge branch 'master' of https://github.com/erichoco/Tiki-King

Conflicts:
	README.md