1st commit
2nd commit before merge
Merge pull request #2 from treble37/merge-into-staging2

Merge into staging2