Refactored everything, according to the book, that I saw. Stopped at "Metaphor-based Rules: Introduce Explaining Variables". Commented out some unused variables.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/csc130nim/ComputerPlayer.java
	src/csc130nim/StateCalculator.java