add FeatureB
add featureC
merge A and B
Merge branch 'master' of https://github.com/Book4212/pick-super-engineer

Conflicts:
	picker.rb
Merge FeatureC and modified FeatureA and B