Worked on category page, still needs some fixing and styling. Fixed db, and added images.
adding statics
merge on views
merge errros
Merge branch 'master' of https://github.com/meet-projects/bookLists-y2-2013
Repaired conflicts, added images of books to category page.
Merge branch 'master' of https://github.com/meet-projects/bookLists-y2-2013
Worked on category page...
fix merge errors