fixed knob not moving with text input
can add combos via enter
Merge branch 'master' of github.com:tihuang/combopedia_heroku
collect
fix merge
collectstatic