index.html with initial changes for hw4. bootstrap in <head>
initial nav bar; initial marketing material.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html