small changes

small changes
commit fix

commit fix
Merge branch 'gui' of https://github.com/nelsonbss/rubiks into gui

Conflicts:
	bin/rubiks_debug.exe
	bin/rubiks_debug.ilk
	bin/rubiks_debug.pdb