clear
Merge branch 'master' of https://github.com/imhu/imhu.github.com

Conflicts:
	README.md