merge
Merge branch 'master' of https://github.com/gabrielformica/Rubik-s-cube-solver
luego de complictos
Conflicts:
	src/rubik.cc