wee

wee
Merge branch 'master' of https://github.com/hugooesthere/tripping-archer

Conflicts:
	test1.html
Merge branch 'master' of https://github.com/hugooesthere/tripping-archer