mayor bugfix + random move generator
Merge branch 'master' into parsolve

Conflicts:
	main.cpp