hehehe
Merge pull request #22 from OckhamsRazor/janelai

hehehe
audio & gui conflict merge