first commit of second feature
Merge branch 'secondfeature'
Merge branch 'master' of github.com:jlem/GitSchool