re-fix history
Merge branch 'master' of github.com:Bladtman242/ITU.Year2.RentIt