test3
Merge branch 'master' of https://github.com/minimal423/git-test

Conflicts:
	git-test.html