resolved merge conflict
merge conflict resolved
Merge pull request #26 from Jamanius/seed_db

Seed db
user can upload new post with image
Merge pull request #27 from Jamanius/upload_images

user can upload new post with image
merges resolved
merge conflict resolved
resolve conflicts