Block comment on botvin_lifeskills.models.User
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/models.py
Json dump implemented. User choices saved in text field.