user error commit
policy
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	api/policies/sessionAuth.js
	config/policies.js