JoinGame #1

Not done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/marine/ServerProperties.java