these to be overwritten
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf

Conflicts:
	client/app/views/people/show.html
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf