scrapping old code
mayor bugfix + random move generator
Merge branch 'master' into swapcube

Conflicts:
	calc.cpp
	main.cpp