Dropdown
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/db.sqlite3
	cs98jam/jam/templates/jam/index.html
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/db.sqlite3
	cs98jam/jam/static/jam/handlers.js
	cs98jam/jam/static/jam/style.css
	cs98jam/jam/templates/jam/index.html