changes
Merge branch 'master' of github.com:benloustau/rails_blog
changes to destroy post
Merge branch 'master' of github.com:benloustau/rails_blog
Merge branch 'master' of github.com:benloustau/rails_blog
changes to a lot of stuff
merging conflicts