Quick change
Change fixed
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Implemented login functionality with navbar being modified appropriately
Beginning removing data modification by guests
Merge branch 'master' of github.com:kbrougham/Pomometer
Implementing admin session checking halfway done
fixed conflict with reports_controller.rb