story started
created new txt gabys
my first commit
a demo message
Merge branch 'aname' of github.com:chriscauley/intro-to-git into aname
Merge branch 'aname' of github.com:chriscauley/intro-to-git into aname
Merge branch 'aname' of github.com:chriscauley/intro-to-git into aname
added lines to story
added a cat to robot story
getting ready to show off conflict
hurf
Merge branch 'aname' of github.com:chriscauley/intro-to-git into aname
random changes
more random changes
kevins duck story
Merge branch 'aname' of github.com:chriscauley/intro-to-git into aname
trying to get a merge conflict
reconciling kevins changes and mine
Merge branch 'aname' of github.com:chriscauley/intro-to-git into aname
Merge branch 'aname'