slimmed down the controller a bit
Merge branch 'master' of github.com:ninjahippo/gem