created Post model and migration. Wrote first test for Post checking that post.content is not empty.
Implement author to Post, test for author presence
created test to check that post.author exists
Removed merge conflicts
Merge pull request #3 from cprater/create_post

Create post