comitt
gh
Merge branch 'master' of git@github.com:tenznhok/Group320.git

Conflicts:
	Persistence/derby.log
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java
adjust wrong data
Merge remote-tracking branch 'mike/master'

Conflicts:
	ModelClasses/src/edu/ycp/cs320/awesomepage/shared/FriendsList.java
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/DerbyDatabase.java
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java
Merge remote-tracking branch 'LOU/master'

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