conflict resolution
Merge branch 'master' of github.com:wannabefro/BAMC into amanda-pulse
connect analyzer to speakers
merge conflicts