removed controllers
Resolving conflicts
Merge branch 'master' of https://github.com/Gelatos/CastleOfSteam