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.
added another note.
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.
Merge branch 'master' into clay

Conflicts:
	dev2test.txt
adding to note section.
removing some files.
Merge branch 'clay'

finally merging my branch :)