New feature start
dev4 added a file in feature4
another file dev4
Merge branch 'feature4' of github.com:nacosta/test_git_live into feature4
Modified another file
Merge branch 'feature4' into staging