First Commit

Conflicts:
	index.html
Header Integration
First Commit

Conflicts:
	index.html
Second Commit
Merge remote-tracking branch 'origin/master'