README
Merge branch 'master' of github.com:hanshoglund/faudio
Test conflict.