time zombi
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/coloringbots/Launcher.scala
	src/main/scala/coloringbots/PrintZombi.scala
	src/main/scala/coloringbots/PrintingBot.scala
	src/main/scala/coloringbots/bots/PrintingBot.scala