yoojin
Merge branch 'yoojin'

Conflicts:
	StudentMenu.c
Merge branch 'master' of https://github.com/yoojinjean/sogongood

Conflicts:
	StudentMenu.c