Added rvmrc to git ignore list
Merge branch 'master' of github.com:melissakate/time_card
Merge branch 'master' of github.com:melissakate/time_card
Merge branch 'master' of github.com:melissakate/time_card
Merge branch 'master' of github.com:melissakate/time_card
Merge branch 'master' of github.com:melissakate/time_card
Cleaned models folder
Cleaned controllers folder
Cleaned time_card views
Cleaned users view
Cleaned users controller
Cleaned time entries controller
Fixed bugs introduced in users controller
Fixed merge conflicts