change user_login_widget
change the user login widget with origin master
Merge branch 'prescott_controller' of github.com:prurph/checkup into yiyang_routine_view
create the routines_page.html.erb file
the routines_page.html.erb can show the button of tags with sorted routine value, hide if this value equals -1
improve the routines_page.html.erb and all test with factory girl
Add click handler and methods to category.js to deactivate categories on setup page
updated the basic events view
Refactor CheckUp.Category class to have single method for AJAX requests
Merge pull request #1 from prurph/yiyang_routine_view

Yiyang routine view merge into combined controller views
Merge pull request #2 from prurph/praggya_eventview

Praggya updated events view
Work on CheckUp.Category sorting
Fix merge conflicts
Merge pull request #4 from prurph/prescott_controller

Merge scaffold views for events, routines, setup pages
Fix merge conflict with comments in pages_controller