Added skeleton code to evaluate in MachinePlayer.java
Merge branch 'kevin' into test

Conflicts:
	player/MachinePlayer.java
Lots of fixes...lots -___-