Merge pull request #9 from jgoley/a-branch

A branch
Merge pull request #10 from jgoley/a-branch

adds header
adds registration page
small change
Merge branch 'master' of github.com:jgoley/trailblazr

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

stuff
polishes sign up page
polishes header
fixes conflicts
Merge pull request #14 from jhath16/justin-branch

Justin branch
fixes problems
Merge pull request #15 from jhath16/justin-branch

fixes problems
fixes issues