merged code with adrian

merged index.html.
Merge branch 'master' of https://github.com/mjpric3/BlurryLizardProject.git

Conflicts:
	index.html