no message
Merge branch 'master' of https://github.com/JaniAnttonen/ScalaBlackJack

Conflicts:
	.idea/workspace.xml
	Ventti.iml