commit
Merge branch 'master' of github.com:smokinjoe/hamihu

Conflicts:
	index.html