...
Merge branch 'master' of github.com:2009Yellow/GlowProcessing
...
Merge branch 'master' of github.com:2009Yellow/GlowProcessing

Conflicts:
	GlowUI/GlowViews.pde