adding hola.rb to my branch.. try not to ever merge. But why?
a funny Jpeg can be included in a repo.
Merge branch 'master' into clay
adding my own faq.
adding some branch documentation.. branching from a branch.
Update README.md
Update README.md
Update README.md
Merge branch 'test' of github.com:clayball/gitgroup-stout
Revert "Merge branch 'test' of github.com:clayball/gitgroup-stout"

This reverts commit d9cbfc2d1593f29f8ba3beb1ef30c30e04830d8c, reversing
changes made to a36b3e89438a886dff5fe3d09bdb98702ab9750e.
Merge branch 'test' into clay

I want to merge 'test' into my branch, 'clay'
added answer to first question.. getting an individual branch when
you don't have it.
added two more questions about undoing a merge and going back to a
previous commit.
fixing issue with the link to Scott video on youtube.
Update hola-git.java

quick edit testing Github interface
in dev now.
not mac
Merge branch 'dev'
advancing dev after dev merge with master.
add word