first commit in feature 6
second commit in feature 6
third commit in feature 6
Merge branch 'featuresix'
Merge branch 'master' of github.com:Jlem/GitSchool