Merge branch 'master' of github.com:pmills88/Project-2
Styling .. fonts, padding
fixing merge issue
Merge branch 'master' of github.com:pmills88/Project-2
Fixed sidebar toggling
Merge pull request #28 from Elwend/master

Liz