javadoc'd player
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8.git
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8.git

Conflicts:
	Player.java
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8.git
test