Saving work
Merge branch 'master' of github.com:IMD-UFRN/OpenRes
Saving users
Edit user done
Delete user done
Resolving conflicts (reservation.rb)