made HTML5
Merge branch 'master' of https://github.com/rujinxero/mytestrepo

Conflicts:
	index.php