style.css added attributes
Commit before merge
Merge branch 'master' of github.com:dcarrot2/fishackathon

Conflicts:
	registration/views.py
Section B Html done