Feature Two stub
fixes on master
feature two complete
Merge branch 'master' of https://github.com/jankareddi/SampleRepo into FeatureTwo
minor changes after pull