fixed timeline zoom > 25
add to gitignore
Merge branch 'master' of github.com:projecttouch/projecttouch
add effects to side bar
give some feedback on effects
fixed layout
Merge branch 'master' of https://github.com/projecttouch/projecttouch
Allow switching off of filters
Merge branch 'master' of github.com:projecttouch/projecttouch
Add ability to turn off filters
begin edit video page
remove jquery ui
improve slider
css tweak
remove jquery ui for levels
log different levels on change
latest
Merge branch 'master' of https://github.com/projecttouch/projecttouch
add back button
merge