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
conflict
userscontroller test
Merge branch 'master' of https://github.com/Groarq/tablica