rectify merge conflict with rebase
Create new sessions controller. Move process login actions from users to sessions controller.
Updated routes to be restful. Updated tests accordingly - all are passing and app functions correctly.
Add bCrypt gem to application
Remove Admin form from hompage
Add modal to homepage for Admin login
Change Users:password_hash field to Users:password_digest
adds a pie chart, accurate labels, and no db contact
chart in progress
adds working chart. adds endpoint for chart data. adds event model methods for collecting data
adds first phase of second chart
bubble chart progress, x-axis complete
Protect routes from being accessed by unauthorized user with http_basic_authenticate
Consolidate process_login actions into one action
Consolidate login routes into one
Add "Parent or Student" field to login form to find correct user
adds toggle to Ruskin's partial event detail show
Switch from using session[:error] messages to flash[:error] messages
Comment out tests which access Admin Dashboard (for now)
Refactor/modify other tests to reflect changes in route naming conventions
adds working 3-part toggle in dashboard. includes 2 href and one button functioning ajax calls.
fixes merge conflicts
Merge pull request #26 from gopher-snakes-2014/Test_Refactor

Test refactor
fixes merge conflicts with restful route redo
Merge pull request #25 from gopher-snakes-2014/anders_chart_spike

Anders chart spike
add delete method for untagging to event_tag controller
add delete route to hit untagging method in event_tag controller
add equal and opposit ajax method for untagging