repair routs
changed html to haml in edit user view
Merge branch 'master' of https://github.com/Groarq/tablica
Merge branch 'master' of https://github.com/Groarq/tablica
deleted user_controller_spec
Merge branch 'master' of https://github.com/Groarq/tablica
created users_controller_spec.rb
Merge branch 'master' of https://github.com/Groarq/tablica
DefaultWorkRequest for admin
fixed @user
conflict
Generated and filled migration to add tags to user
added DefaultWorkTime to new user
Schema.rb automatically changed
Added tags form to edit user view
Added make_sure_its_mine function to authenticate user before edit/delete action
userscontroller test
Merge branch 'master' of https://github.com/Groarq/tablica
Inbox added
merged