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
event styling full screen map and search form style
users page now ability to modify roles and admin granting
added smooth scroll to the vents page
fixed conflicts with users controller and routes
added events images, added a migrations to add asset the uploader for images to the events databse also made it work on the form upload
changed anme in link to account settings
added styles a toggle button the the user accoutn setttings so you can switch views in the settings
styles chnaged for the show page of the event.
Merge pull request #32 from lukemesiti/lukeDevel

pundit user policy
resolved conflict
Merge pull request #33 from lukemesiti/sambox

Resolved conflicts with user controller
testing of forem styling
fixed user controller conlict with update method
fixed the scrolling of the page for events
Merge pull request #34 from lukemesiti/events-styling

Awesome work, Emily!!
Merge pull request #35 from lukemesiti/information

Worked on the information page. YAY
Merge branch 'master' into information