Controller generated, views started
Added all files for push
Fixed merge conflicts
Merge branch 'master' of github.com:kbrougham/Pomometer
Using google charts api
Implementing admin session checking halfway done
fixed conflict with reports_controller.rb
new migration changed password name
validation of login complete, admin link added to navbar when logged in as admin