KU
Merge remote-tracking branch 'origin/master'

Conflicts:
	HTML5/index.html
KU
KU
KU
KU