Merge branch 'master' of heroku.com:drbond-bitstarter-s-mooc into staging
edited out HEAD
Merge branch 'master' into staging
Merge branch 'develop' into staging

Conflicts:
	index.html
fixing git conflict