status
Merge branch 'master' of git@github.com:tenznhok/Group320.git
Editing and adding some designs
adjustment and database
changes
Merge remote-tracking branch 'LOU/master'

Conflicts:
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/DerbyDatabase.java
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/FakeDatabase.java
	WebApp/src/edu/ycp/cs320/awesomepage/client/StatusPosting.java