did stuff
did more stuff
merge commit
Merge branch 'master' of https://github.com/rcockbur/project