tree ce9e0a348e7c93795aab2c8280949d4cba3db87f
parent 66d0f27f741baa1be7a192354994cddc0d28d17a
author Jesse MacFadyen <purplecabbage@gmail.com> 1436555977 -0700
committer Jesse MacFadyen <purplecabbage@gmail.com> 1436555977 -0700

resolved conflicts, added manual test button to change audio playback rate.