Fix Images
Merge remote-tracking branch 'origin/master'
test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Javadoc added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/view/LoseState.java
	src/view/VictoryState.java