edited pages with css. fixed navbar. abandoned comment tests.
grey boxes css done for comments
basic css done! still needs more fun stuff
Merge branch 'master' of https://github.com/catherinev/OurProject into comment
css and stuff
fixed merge errors
Merge pull request #45 from catherinev/comment

Comment
merge conflicts resolved