small change
Merge branch 'master' of github.com:jgoley/trailblazr

Conflicts:
	app/styles/main.scss
Merge pull request #12 from millesky87/master

stuff