fixed weird bug where controls stopped working o.o
Merge branch 'master' of https://github.com/deannazhu514/15237-AND