Merge pull request #19 from tp9/master

Simplified code and changed game to turn-based on a grid
Merge remote-tracking branch 'upstream/master'
Merge pull request #20 from tp9/master

Added border for starting room
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.