added feature A
changes to Feature A
Merge branch 'FeatureA' into dev