stashing changes
fixed merge conflicts
html and css
Fixing bug
css
html and css added
conflicts fixed
Merge branch 'master' of github.com:TomGroombridge/book_project into chris_branch
database changes
merging
database change
Merge branch 'master' of github.com:TomGroombridge/book_project into chris_branch