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
Merge pull request #1 from prurph/yiyang_routine_view

Yiyang routine view merge into combined controller views