added previous work
Merge branch 'master' of github.com:lukenels/block-thing