html5 tag
Merge branch 'master' of https://github.com/Black-Moose/Website-V.1.0

Conflicts:
	public_html/index.html