Resolved merge conflict
deleted conversations.erb.orig
Added Post model and appropriate tests for existance and content validation
Added rspec tests for Post class and created model
Merged master onto this branch and resolved a bunch of conflicts
Debugged
Merge pull request #14 from gopher-snakes-2013/create_posts_v2

Create posts v2
fix merge conflict