stuff
Merge branch 'master' of github.com:amytang0/drunktimes

Conflicts:
	templates/index.html