i edited this
i committed georges file
Adding Feature3
i edited this
Merge commit 'cd5e5f8ce030dca90767e51d40590efdc326e665' into develop