controller (hopefully working one!)
Merge branch 'master' of https://github.com/alvinlao/GummyBears