Im back
Merge origin/master

Conflicts:
	HTML5Application/public_html/index.html
	HTML5Application/public_html/stylesheet.css