Fixed copy and paste errors with Two Tile stuff
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller