Updated the Demographics module to keep track of users as well as adding new users to the App. App counts the correct amount of users present using the app
Lifeskill commit to pull
Merge branch 'master' of https://github.com/dcarrot2/DjangoSunstreet

Conflicts:
	demographics/admin.pyc
	demographics/models.pyc
	demographics/urls.pyc
	demographics/views.pyc
	lifeskills/models.pyc
	sunstreet/urls.pyc