some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	chess/chess.rb
	chess/old21/old/chessgui.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	chess/README.md
	chess/chess.rb
	chess/old21/old/chessgui.rb