Merge branch 'master' of https://github.com/ahuber1/FallingGame into ahuber1-master

Conflicts corrected?