new files
conflict removed
changes
added public
Gemfile.lock
new changes
conflict removed