fixed conflict in Gemfile lock
Merge pull request #4 from alexcodreanu86/user

User
Merge branch 'master' of https://github.com/alexcodreanu86/dev_overflow_dev into posts
Merge pull request #5 from alexcodreanu86/posts

Posts
added routes for post