update
Merge branch 'master' of github.com:chrisplyn/cs246

Conflicts:
	Board.cc
	main.cc