add jinha
Merge branch 'master' of https://github.com/JinhaHwang/HihWeb

Conflicts:
	index.html