merge
merge
typo
gemfile lock
Setting up development database
merged conflicts
merge
dev database
binding.pry removal
merge
merge