Footer
Merge branch 'master' of https://github.com/andrewhaw/test

Conflicts:
	test2.htm