maintenance
minor
Merge branch 'minor_touches'

Conflicts:
	w2/minesweeper/Game.rb
maintenance
merged