working on an authetication solution
Merge branch 'master' of https://github.com/dlochrie/norris

Conflicts:
	client/src/app/views/posts/posts-controller.js