Merge pull request #37 from marcusmoller/master

Fixed the makefile (again)
Fixed input when swapping scenery