Add second feature
Edit conflict
Merge branch 'Second-feature' of https://github.com/jingz/playgit into hotfix