try to recovery pics
Merge branch 'master' of git@github.com:tenznhok/Group320.git
Merge remote-tracking branch 'mike/master'
signOut
status
Merge remote-tracking branch 'LOU/master'

Conflicts:
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java