Conflicts:
	RubikCube.cpp
	headers/RubikCube.h
	main.cpp