Merge remote-tracking branch 'origin/master'
Removed cached files for the .gitignore
Merge branch 'master' of https://github.com/beta382/Tetris
Merge branch 'master' of https://github.com/beta382/Tetris
Screw gitignore
Merge pull request #2 from beta382/Austin

Merge Austin to master
Merge branch 'master' into Austin