Woo hoo, new controls
umm
changes?
Merge branch 'master' of https://github.com/gsubram4/chansey
Merge branch 'master' of https://github.com/gsubram4/chansey
Pushing so Nabil can test on phones