Added feature two change
Merge branch 'master' of https://github.com/conwsean/mytesting