Heyyyy gurrllll
Merge branch 'master' of github.com:dcorwin/15237hw4
FUUUUUU
Merge branch 'master' of github.com:dcorwin/15237hw4

Conflicts:
	static/auth.js
	static/index.html