modified:   README
Merge branch 'master' of https://github.com/jabberw0k/Bulls-n-Cows

Conflicts:
	README
	modified:   README