Added comments; minor tidying of some code
Merge branch 'bvu' of https://github.com/justbuchanan/cs2340 into
local_m6_bvu

Conflicts:
	src/spacetrader/models/Player.java
commented bug-ish line
Merge branch 'bvu' of https://github.com/justbuchanan/cs2340 into local_m6_bvu
fixed merge issue
Merge branch 'bvu' of https://github.com/justbuchanan/cs2340 into local_m6_bvu