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

Conflicts:
	templates/homepage.html