added readme to dev
added readme onto feature2, not sure what's gonna happen
and simple
try to solve the conflict
readmeb1
readmeb2
added line in b2
added the new readme
Merge branch 'b2'