Merge pull request #1 from marchese29/master

Merge #1 from marchese29/master
Added basic layout
Fixed space issue
Merge pull request #2 from rniemo/Tetris2

Merge #2 from rniemo/Tetris2