Merge branch 'master' of https://github.com/kmacdon1/COMP-3415-ResidenceProject

Conflicts:
	src/university/residence/House.java
Revert "Merge branch 'master' of https://github.com/kmacdon1/COMP-3415-ResidenceProject"

This reverts commit 275c5794c44ecec307e842c696138633f15ea6fb.