Commit before merge
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet
Fixed admin module
Commit before pull
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/admin.py
	botvin_lifeskills/models.py