changes
implementing message system
cleaning up
messages finished. Password reset Almost finished
small
Merge branch 'master' into Add-change-password-form
Merge branch 'Administrator-user-edit-form' into Add-change-password-form

Conflicts:
	userprofile/views.py
password reset page is all set
Merge branch 'master' into Add-change-password-form

Conflicts:
userprofile/glean.sublime-workspace
userprofile/views.py
conflict
used PasswordInput() widget
Now using counties to link users and memorgs
Merge pull request #11 from Cheekio/Member-organization-profile-page---static

Member organization profile page   static
These don't need to be in the repo
Well that wasn't pleasant
Merge pull request #12 from Cheekio/cleanup

These don't need to be in the repo
Merge pull request #13 from Cheekio/some-forms-work-again

Some forms work again
Merge branch 'master' into Member-organization-profile-page---static

Conflicts:
	memberorgs/forms.py
	memberorgs/urls.py
	memberorgs/views.py