login
Merge branch 'master' of https://github.com/WebtechTeam7/RentMyStuff
Merge branch 'database'
Merge Conflict