Added Highlander King Controller
Merge branch 'master' into HighLanderKing