type/trait tetris for master
Merge pull request #4 from itdaniher/master

type/trait tetris for master