boat image on bottom of screen
boat on bottom, timer bar, and wealth icon in corner
made minor visual changes
you can now choose whether to have an avatar or not
formatted all java files
Merge branch 'version3visualchanges' into version3merge

Conflicts:
	src/game/FishSpec.java
	src/game/GameActor.java
	src/game/GameEvent.java
	src/game/GameModel.java
	src/game/GameSpec.java
	src/game/GameView.java
	src/game/GenerateWindow.java
	src/game/RunGame.java
	src/game/ScriptGenerator.java
	src/game/ScriptWindow.java
	src/game/Trial.java