Sarah's Commit  2
Merge remote-tracking branch 'origin/stage' into stage

Conflicts:
	html/index.html
Merge remote-tracking branch 'origin/stage' into stage

Conflicts:
	html/index.html