decider setup
decision
Merge branch 'master' of github.com:simshanith/compute-midwest-2014

Conflicts:
	bower.json
	grunt/conf/copy.yaml
	public/assets/scripts/directives/index.js
	public/assets/scripts/main.js
	public/assets/scripts/main.pkgd.js
	public/assets/styles/main.css
	public/index.html
	src/scripts/lib/directives/index.js
	src/scripts/main.js
	src/styles/lib/main.styl