Abstracting, made the StandaloneServer run as a thread rather than a while loop (cause...)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/marine/StandaloneServer.java