HTML5 VIDEO
Merge branch 'master' of https://github.com/eliasesquivel/schoolSite

Conflicts:
	index.html