adding css styling
fixed conflicts
fixed conflicts
change route
Merge branch 'master' of github.com:TomGroombridge/book_project
adding plugin css files
Merge branch 'master' of https://github.com/TomGroombridge/book_project into toms_branch
background images
Merge branch 'master' of github.com:TomGroombridge/book_project
smaller background image
pulling images
merging
minor cosmetic surgery
cosmetic
rendering files
renderin pages
changes
books
changes
added book.sql