wut
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/neumont/Nim.class
	src/neumont/Nim.java