bla
Merge branch 'AlanJackMVP' of https://github.com/logantspeedy/Capstone into AlanJackMVP

Conflicts:
	Capstone/nbproject/private/private.properties
	Capstone/web/js/getters.js
updated choose house