my commit 2
Merge remote-tracking branch 'origin/stage' into stage-test

Conflicts:
	html/index.html