Added 4
Started feature5
more work on feature5
Merge branch 'feature5'
Added 5
Added 6
Merge branch 'master' into feature4