Merge branch 'master' of /Users/carl/Desktop/chessFX with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/chess/Main.java