Initial Commit
edited once
edited twice
edited thrice
branch 2-1
branch 2-2
branch 2-3
Merge branch 'paulblessing-branch2'
My awesome changes.
Merge pull request #3 from paulblessing/branch3

My awesome changes.
master changed
more master updates
master once again
Master Commits
Conflict Resolution
squashed from 8
No Comment
Added 'This is a line of text'
1
2