Shuffle

Shuffle updtaed
Merge branch 'master' of https://github.com/Shepphard/Rubics

Conflicts:
	Rubics
Logic.xcodeproj/project.xcworkspace/xcuserdata/philippe.xcuserdatad/User
InterfaceState.xcuserstate
	Rubics Logic/Cube.cpp
	Rubics Logic/main.cpp
commit