updated feed and messages pages
Merge pull request #15 from japagley/master

Updated messages and feed pages.
Removed merge conflicts and started work on messaging feature.