fixing some crappy code.
Love, Carl
Merge remote-tracking branch 'origin/master'

Conflicts:
	.tmp/styles/main.css
	app/scripts/controllers/main.js