Javadoc
Merge branch 'master' into pam-in-progress

Conflicts:
	BattleshipGUI.class
	BattleshipGUI.java
Updating Player and Cell
Merge pull request #20 from pamelawang/pam-in-progress

Updating Player and Cell