adjustment
Merge remote-tracking branch 'mike/master'
adjust
real database , table is working
Merge branch 'master' of git@github.com:tenznhok/Group320.git

Conflicts:
	Persistence/src/edu/ycp/cs320/awesomepage/server/model/persist/DerbyDatabase.java
derbydatabase
designs pics
posting status
status
Merge remote-tracking branch 'LOU/master'