commit to merge
fixing collision
took out wall variable to fix merge c
have a ghost move right by itself
Disabled keys for moving diagonally
fixed merge conflict
Merge pull request #27 from dabeeya/master

have a ghost move
Merge pull request #28 from sidpatel13/master

Disabled keys for moving diagonally