some stuff
Merge pull request #1 from johndbritton/collaborate

Example pull request