added remote:true to posts on user show view
added photo attachment column to Users using Paperclip gem
testing
testing
fix merge conflicts