Commit before push
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/views.py
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/views.py
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet
Changed top news model to include verbose name
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet