database
Merge remote-tracking branch 'kpike1Fetch/master'

Conflicts:
	HeatGem/src/edu/ycp/cs320/heatgem/server/FakeDatabase.java
	HeatGemProblemDomainClasses/src/edu/ycp/cs320/heatgem/shared/User.java