started on the css
Merge branch 'develop' of github.com:liampcollins/liannardo into develop
removed my css stuff
did some more css
changed some css
merge conflict
another conflict