tweaks to materials
Merge branch 'feature/v0_webcam' of github.com:IVXVIXVIII/brain into feature/v0_webcam

Conflicts:
	public/app.js
	src/coffee/views/app_view.coffee