??

ad
rotation and slowing fix

improved rotation routine and it helped the slow down that was happening
fixed merge confilcts

after fixing slow down conflicts
more merge conflicts

ads
Merge branch 'storeTransformations' of https://github.com/nelsonbss/rubiks into storeTransformations

Conflicts:
	src/cubie.cpp
	src/testApp.cpp