Adding 666 to the master
Merge branch 'master' of https://github.com/testzaza/kaka

Conflicts:
	zaza.txt