Added a green file
Added some text to the Green branch
Merge branch 'green-feature'
Merge remote-tracking branch 'origin/master'