Refactor process_login action in users controller
Add 'paperclip' to Gemfile for photo upload option
Add gemfile.lock with paperclip
Add migration which adds event_photo field to events table
Add strong_params to event controller
Add validations for event_photo to event model
Add migration which adds event_photo to events table
Add photo upload form to event creation page
Provide paperclip with a path in which to access imagemagick
Add event model test which responds to new 'event_photo' field
Add feature tests which ensure a parent & student have option to upload photo
Add show action to events controller
Add get route for events#show
Rectify merge conflicts
Merge branch 'master' of https://github.com/gopher-snakes-2014/shieldED into Andrew-Refactor
adds much style to admin dashboard
adds email function to admin dashboard
adds function to list recent reports
adds j-slider
adds accurante search form for event details
Schema changes from remigration
Rectify merge conflicts
Fix bug with new event form which allows the event to correctly associate with a user
Add information to acknowledgement page
new feature test working. Active working search option for admin from db details.