logging
Merge branch 'master' of git@github.com:pholda/discats.git

Conflicts:
	core/src/main/scala/edu/agh/student/discats/ca/CASystem.scala