week10 assignmnet changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	index-bootstrap.html
	index.html