cool feature first commit
Merge branch 'myfeature' into develop
first commit of myotherfeature
Fixing conflits while merging from myotherfeature to develop
thirdfeature first commit
fourthfeature first commit
Merge branch 'thirdfeature' into develop
Fixed conflicts merging fourthfeature to develop
fifth feature first commit
Merge branch 'fifthfeature' into develop
Merge pull request #1 from camiloherbert/develop

Merge to staging all the current stable features implemented in develop
Merge pull request #2 from camiloherbert/staging

Merging new features to master