Style Sheet @ base.html -Matt
Small chages ot base.html that conflicted with matt's branch. Trying to get up to date
merged andrew with dawson on andrew
Removed old images and added mockup images in /site/files/img
changed .gitignore to filter out images directly in site/files/ but allows the mockups in site/files/img/
changes from .gitignore didn't go up last time? committing before merging with dawson to develope
Merge branch 'andrew' into dawson