Routing functionality and stopping mechanism
Merge remote-tracking branch 'origin/master'

Conflicts:
	TwitterSim/src/main/scala/simulator/Server.scala