Merge branch 'development' of github.com:judithfan/sketchloop into development

'merge after getting rid of all the unnecessary stim files'