hw6 part 1 and 2
Merge branch 'master' of git@heroku.com:bbbitstarter.git

Conflicts:
	index.html