Merge pull request #8 from teamecho/master

updating I think
Merge branch 'devzeli' of https://github.com/teamecho/Sketchtris into devzeli
fixed shapes, added cube struct, messed with activity a bit
trying to merge changes