proper relocation of FakeDatabase class
Merge branch 'master' of git@github.com:dho7/ycp-cs320-project.git
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project/src/edu/ycp/CS320/shared/IDatabase.java
	ycp-cs320-project/src/edu/ycp/CS320/shared/User.java