-
Merge branch 'master' of https://github.com/marinasubmarina/Chess_vm

Conflicts:
	.idea/workspace.xml