Added switch logic and improved kick.
Merge branch 'master' of https://github.com/cmorin6/Fat-Ninjas