recomitt aa
Hand merge was done.

Merge branch 'master' of github.com:shinotra/testgit

Conflicts:
	test.html