adding a file to git on the integraiton branch
a commit on the trunk branch
Merge pull request #1 from weaties/trunk

a commit on the trunk branch
a change on integration
Merge pull request #2 from weaties/integration

Integration - crud - I wanted a fast forward merge...