.gitignore
Merge branch 'master' of https://github.com/sistar/kafka-sandbox
Merge branch 'master' of https://github.com/sistar/kafka-sandbox

Conflicts:
	.gitignore
scala version headache