moved over
fixed merge conflict
added new styles
Merge branch 'dev' of github.com:wendynichols/Blog_project into dev
styles
Merge branch 'dev' of github.com:wendynichols/Blog_project into dev