file
added some a housing servlet and housing class in the model, this is my first commit for the project
file
added some a housing servlet and housing class in the model, this is my first commit for the project
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Controller/Housing.java
	src/Controllers/LogInServlet.java
	src/Model/Housing.java
	src/Servlet/Housing.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Controller/Housing.java
	src/Controllers/LogInServlet.java
	src/Model/Housing.java
	src/Servlet/Housing.java