use two configs
some uncommitted changes found on the reactor mac
sound files from the mac
merge master