test
Merge branch 'master' of https://github.com/aboru/Rubiks
Merge branch 'master' of https://github.com/aboru/Rubiks
added functionality to main.cpp
Merge branch 'master' of https://github.com/aboru/Rubiks