Merge remote-tracking branch 'origin/master'

Conflicts:
	src/SeaWorld.java

Bringing code up to date

New pattern, levels increment properly, menu
still needs work.
No idea