nono
Merge branch 'master' of https://github.com/ytbeom/assn2

Conflicts:
	CGASSN2/lion.cpp
	CGASSN2/main.cpp