local
Merge branch 'master' of https://github.com/brollins90/csc130_nim.git

Conflicts:
	src/csc130nim/Manager.java
added the brain again.
Just kind of checking in on the code.