change downstream
Merge branch 'master' of https://github.com/urthbound/gittest
I fixed the conflict, dave.
Conflicts:
	count.rb