account popup 제작
Merge branch 'master' of github.com:madisonave42/t1

Conflicts:
	js/event.js