fixed duplication
Merge branch 'master' of heroku.com:surroundsound
fixed thing
ggg
grgh
eherh
rhr
rhr
ehrh
Merge branch 'master' of https://github.com/mHacks-UWProject/SurroundSound