removed crufty elements from css
conflict resolved
made changes to the dashboard
Merge branch 'dev' of github.com:matyikriszta/WDI_Project2 into dev
edited the user profile page
Merge branch 'dev' of github.com:matyikriszta/WDI_Project2 into dev