Commit before pulling
Merge branch 'master' of github.com:dcarrot2/fishackathon

Conflicts:
	fishackathon/templates/registration/base.html
Merge branch 'master' of github.com:dcarrot2/fishackathon
With header implemented