Some initial changes
add devise for users
merge conflicts resolved in gemfile
merge conflicts in gemfile resolved