jjunk
Merge branch 'Brian' of github.com:acronos7021/RubixCube into Brian

Conflicts:
	RubixCube/RubixCube/Cube.cpp
Minor changes, but wanted to move it to another desktop