Edit 2

Site almost completed.
Merge branch 'master' of https://github.com/JustinTafoya/HTMLfinal

Conflicts:
	Index.html
	style.css