carrierwave gem works
When I pulled from origin/master to master branch, my changes regarding showing broken image links vs. showing N/A were removed. That was annoying. I changed that stuff again. Not sure why that happened? How can I avoid that for next time
merge conflict fixing show and index for posts
working to get comments up and running
gemfile resolution
reviews now tied to posts
merged add-carrierwave-gem