Change title
Merge remote-tracking branch 'origin/master'

Conflicts:
	git-sample/index.html