Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Deleted pycache folder and modified gitignore
Added collision detection. Moved key handler to game.py. Added generate_tiles method to create array of tiles.
Merge pull request #21 from tp9/master

Multiple changes