merged 휘의 code
Merge branch 'master' of github.com:eggie5/SDSU-CS570-SUMMER13

Conflicts:
	A2/A2/ui.c