edit from Oswald
Merge branch 'master' of https://github.com/zanedev/testrepo
updating?
Conflicts:
	test.html
Merge branch 'master' of https://github.com/zanedev/testrepo
merging master from zane