Josh's first commit

Attempting to make first commit. Real commit coming soon
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html