add FeatureB
edit picker.rb
add featureC
release code 1
Merge pull request #1 from jutamasJeab/master

add featureC
Merge branch 'master' of https://github.com/sadomw/pick-super-engineer into sadomw-master

Conflicts:
	picker.rb
Merge branch 'sadomw-master'
Merge branch 'master' of https://github.com/bodeethorn/pick-super-engineer into bodeethorn-master

Conflicts:
	picker.rb
Merge branch 'bodeethorn-master'
Resolve picker.rb
Edit main function