no change
fixed conflict
fixed conflict
Changed form layout for new rental
Added like to item through barcode
fixed merge conflict
fixed merge conflicts
Added link to item from barcode
Added link to item from barcode
initial commit
Fix merge conflicts
Added validations and unit tests for rental
Added limit and max  on renewals
Fix conflicts
Added some authrentication code so that users can't acess function such as new or edit in the controller files
Fixed a conflict with rental model
fixed merges with Gellert's stuff