end of day
merge
scrub
merge
scrubbing basics
merge
show/hide panel stuff
Merge branch 'master' of github.com:projecttouch/projecttouch