Testing to commit.
Merge branch 'master' of github.com:hanshoglund/faudio
Test conflict.
Merge branch 'master' of github.com:hanshoglund/faudio

Conflicts:
	platform/windows/atomic.c
Merge pull request #84 from patrikohlsson/master

Conflict test