Should have pushed earlier...
Merge branch 'master' of https://github.com/indspenceable/bc

Conflicts:
	lib/bases.rb
	lib/game.rb