mix
XMerge branch 'master' of https://github.com/Snjolfur/Chess

Conflicts:
	main.c