changes on twisting
Merge branch 'gui' of https://github.com/nelsonbss/rubiks into gui

Conflicts:
	src/testApp.cpp