The Everfree Forest
Merge branch 'master' of https://github.com/Lawliet-L/redhead

Conflicts:
	views/template.jade