Started work on Cocoon.fr
Merge branch 'master' into cocoon

Conflicts:
	src/main/java/player/Coward.java
Added my version of Waller. Added code to Game.java to clear the output directory of .html prior to game start. Also added code for displaying the locations of one character in the output
Merge pull request #1 from dbaileychess/cocoon

Added my version of Waller. Added code to Game.java to clear the output ...
Re-added entrants that were removed by previous merge
General Updates
Fixed Merge
Fixed Merge