-rental logic is a bit messed up, trying to find where the problem lies in renting...
-fixed multiple locker bug, but still some errors
-Fixed SQL statement, where we were not checking if the locker number matched up, so it returned any locker in that building.
Merge branch 'master' of https://github.com/ESpearman/COMP3350-Group-Project into morgan_rental_logic

Conflicts:
	src/lms/application/PopupWindow.java