Octave is what it should be
Fixed merging in player
Merge branch 'master' of https://github.com/ireardon/cs32-final

Conflicts:
	src/edu/brown/cs32/final_group/backend/Player.java