moved non-wall/solid tile collision code to Level.py from Player.py
fixed merge conflict