preparing
commited for a merge
removed some bugs
Merge branch 'master' of https://github.com/Crysis-Gomez/Tetris

merging
new stuff