Added null checked to algorithm
Fixed conflict
Merge branch 'master' of github.com:mHacks-UWProject/SurroundSound