Merge pull request #1 from Logicail/master

Pinball random
Merge pull request #2 from Logicail/master

Fix bug if couldn't interact with exit
SandwichLady random
Merge remote-tracking branch 'upstream/master'