git add web.rb
^x
^X
Merge branch 'master' of github.com:KindaDragonBorn/ruby-sample

Conflicts:
	web.rb