Added the fish hackathon base and register changes modified the urls and views in order to store changes created on the A portion of the registration
Merge branch 'master' of github.com:dcarrot2/fishackathon

Conflicts:
	fishackathon/templates/registration/register.html
	registration/views.py
Checking registration html