dosc etc
Merge branch 'master' of github.com:romanowski/krkStreetActor

Conflicts:
	.gitignore
	build.sbt