Added comments, basic css
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	demographics/admin.pyc
	demographics/urls.pyc
	demographics/views.pyc
	lifeskills/models.pyc
	lifeskills/urls.pyc
	lifeskills/views.pyc
Commit before trying new graph
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	demographics/views.py
	demographics/views.pyc
LifeSkills Pretest Html and CSS almost done