main.js added
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/jam/static/js/main.js