updated users displayed in directory
Merge branch 'master' into lukeDevel

merged conflicts

Conflicts:
	app/controllers/users_controller.rb
pundit user
- updated user controller and policy to display appropriate users depending on current_user role
Merge pull request #32 from lukemesiti/lukeDevel

pundit user policy