주석
Merge branch 'master' of https://github.com/onesup/evezary

Conflicts:
	event.html