temp commit
Merge branch 'master' of https://github.com/SeWitt/StoreNRent

Comflicts resolved

Application.java (controller came with init commit should not be used)