useless commit
Merge branch 'master' of https://github.com/orablu/eecs290-project2
Fixed ghost and player jumping