Update to Web App files
Merge branch 'master' of https://github.com/EFJackson/SMS

Conflicts:
	stuffindex/pages/__init__.py
	stuffindex/pages/templates/base.slim
	stuffindex/pages/templates/index.slim