start
Merge branch 'master' of https://github.com/ytbeom/assn4

Conflicts:
	CGASSN4/ObjLoader.cpp
	CGASSN4/ObjLoader.h
	CGASSN4/lion.cpp
	CGASSN4/lion.h
	CGASSN4/main.cpp
	CGASSN4/rock.cpp
Merge branch 'master' of https://github.com/ytbeom/assn4
lighting, shading