Implements a simple client-server model
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/Main.scala