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

Conflicts:
	picker.rb
Merge branch 'sadomw-master'