commit before merging master
resolving merge conflicts
committing before pulling master
resolve merge conflicts
committing before changes
merged master
Merge pull request #15 from gatkin/more-github

More github