Merge branch 'master' of github.com:ikhwan/pythonkungfu

Conflicts:
	README.md
Merge branch 'master' of github.com:krisanalfa/pythonkungfu