another conflict
fixed conflicts
Merge branch 'master' of github.com:ericchoi35/soundhub