updated makefile
Merge branch 'master' of github.com:aboru/Rubiks
updated makefile