커밋
Merge branch 'master' of https://github.com/allday32/allday32.github.com

Conflicts:
	index.html