house dao stubs
Merge remote-tracking branch 'origin/master'

Conflicts:

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/entity/Resident.java