Merge branch 'master' of https://github.com/kkoki/html5

Conflicts:
	kkoki_explosion/src/bomb.gif
tsts

tststs