Added Feature B Class
Added Variables for it
Added age
Merge branch 'feature-b' into develop
didn't do much
Merge branch 'master' into develop

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