Added age to Feature A
Merge branch 'master' into develop

Conflicts:
	GitTEst/src/main/java/com/josh/FeatureA.java