commit so i can merge with the latest version
Merge branch 'master' of github.com:Daniel-Christopher/NextNewCA
added color fading, tried to fix some sound trigger stuff