All working except the colours on 'all'
css changes
Bug fixes
bugs
css
Merge branch 'master' of https://github.com/joshricha/project_2
Merging
CSS for wishlist
Conflicts resolved
Merge branch 'master' of https://github.com/joshricha/project_2