sup
Merge branch 'master' of https://github.com/Squeakrats/BoilerMake2014

Conflicts:
	app/scripts/main.js
visualizer live