the rest of it
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/cs98jam/settings.py
	cs98jam/jam/templates/jam/index.html