lol
Merge branch 'master' of https://github.com/sweapon/SubmarineGame

Conflicts:
	Submarine/bin/Game/GUI.class
	Submarine/bin/Game/Generator.class
	Submarine/src/Game/GUI.java
jkdløfkjldøsa
lolfdsafadafdsfasfdasdafsdafs