fixed sql
Merge branch 'master' into holds

Conflicts:
	Resources/insertTestData.sql
	templates/index.html
making test data look better
books set to on-hold upon return
merge conflict
cartviews
headers
holdscart update
fixed query
cart update
removed time
cmt
mesgd
com
push
push
fixed not logged in error with catalogue
final
Merge branch 'holdscart' of https://github.com/wywong/CS304 into holdscart
last