modal's now working for posts from the navigation bar and the profile page
fixed merge conflicts. added some css to the conversation page, work in progress
fixed merge conflicts in app/views/profile/show.html.erb, app/views/layouts/application.html.erb, app/assets/javascripts/application.js.
Merge branch 'master' of https://github.com/michballard/fhellow