moved room switching to a separate method, going from room 2 to 1 is buggy right
Merge branch 'master' of github.com:propra13-orga/gruppe13