FIxing database functionality, made API call more efficient.
fixing merge conflict
Merge branch 'master' of github.com:mHacks-UWProject/SurroundSound