another commit
Merge remote-tracking branch 'choose_remote_name/master'
Moved User and UserTest back to problem domain project as they were
currently duplicated in both project.

Keep problem domain output of GUI
Moved problem domain classes from GUI to problem domain project

Also added FireApparatus object functionality. Wrote a unit test and
used the fake database classes to store multiple apparatus object in the
database. Test was successful.
Changed the controller classes to support IDatabase instances, new test,

the controllers now do not use a hardcoded database, the validate user
controller test now incorporates another test with the addusercontroller
that emulates what will happen when a new user fills out the fields then
clicks the new button, followed by clicking the log in button
added a basic home page class that will contain routes to the features
tidying
Merge remote-tracking branch 'origin/master'
very small changes
Renamed DemoView class to LoginView as this is our main login view
added a Form and FormView class
Added an apparatus view to display the information about the fire
station's equipment
Added link for apparatus on home page
login now works correctly!!!
Merge remote-tracking branch 'drew/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/DemoView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/LoginView.java
Merge remote-tracking branch 'drew/master'

Conflicts:
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/HomePageView.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/Ycp_cs320_project_ui.java
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/Ycp_cs320_project_ui.java
	ycp-cs320-project-ui/src/edu/ycp/CS320/client/calendar.java
Push!!!
here are my changes