New commit from Rusty
Merge branch 'master' of github.com:kid-icarus/funtime-training