added some readme text for red feature
added step 6 t o instructions
added step 6 for reals
made changes to readme.txt on master
added changes to readme
more changes to readme.txt
more edits to instructions.txt
one more for instructions.txt
first commit of NewFile.rb
trying to force a merge conflict
still trying to force merge conflict
trying to force
resolve merge conflict
Added AnotherFile.rb at home
Merge branch 'master' into green-feature
changed instruction 1 in gf