master .git attributes
master ignore
Merge branch 'master' of https://github.com/nelsonbss/rubiks
Merge remote-tracking branch 'origin/game'
Merge remote-tracking branch 'origin/game'
Merge remote-tracking branch 'origin/game'
Merge remote-tracking branch 'origin/game'
Merge remote-tracking branch 'origin/game'
Merge remote-tracking branch 'origin/game'
first commit of branch armature

made new branch , after game, to work on the loading and displaying the
armature
commmit fix

commit fix
stable-dummy gui ok - armature v0.1

first sight of an armature and a selected object together
cleaned up armature code - color black

cleaned up old code inside armature, changed the color to black