merged commit
commit classpath
tidying
User button on home page works, but displays no useful data

Contact classes are present. I added a comment to each class
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
changed .gitignore
trying to make same as josh's
commit
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/FakeDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Merge remote-tracking branch 'Drew/master'

Conflicts:
	ycp-cs320-project-persistence/src/edu/ycp/CS320/server/DerbyDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
Added page to add fire apparatus to DB