added same feature
added a discrepancy to same_feature
Merge branch 'feature_b' of https://github.com/dstavis/GitFlowTest into feature_a

Conflicts:
	same_feature.rb