added Procfile
merge conflict?
idk

Merge branch 'master' of github.com:jbcima/twerkOut
Merge branch 'master' of github.com:jbcima/twerkOut
idk
Merge branch 'master' of github.com:jbcima/twerkOut
added scoring function with tempo detection etc
idk whats going on
Merge branch 'master' of github.com:jbcima/twerkOut
fixing merge conflict. new front end
Merge branch 'master' of github.com:jbcima/twerkOut

i keep getting these...