Merge branch 'master' of https://github.com/ros3bud/Community-Imaging
Add foundation columns to People page, update styling.
Changed
'People' to 'Staff' in the nav bar.
Merge branch 'peoplePage'

Conflicts:
	app/views/screenings/_nav.html.erb