Yep
Merge branch 'develop' of github.com:Apercu/Warhammer into develop

Conflicts:
	views/main.html