overdosed and microphone
Merge branch 'master' of https://github.com/ericmick/indie

Conflicts:
	.gitignore
	assets/js/indie.coffee
	assets/js/noise.coffee
	assets/js/punk.coffee
	assets/js/worker.coffee
	build.cmd
	public/indie.coffee
	public/noise.coffee
	public/punk.coffee
	public/worker.coffee
	scripts/indie.coffee
	scripts/noise.coffee
	scripts/punk.coffee
	scripts/worker.coffee