conflict test
Merge branch 'master' of https://github.com/seash/all-in-one

Conflicts:
	test2.html