deleted:    src/cube.cpp
	deleted:    src/glm.c
	deleted:    src/glm.h
	deleted:    src/hello.cpp
	deleted:    src/model.cpp
	deleted:    src/solar.cpp
Merge branch 'master' of https://github.com/murkaje/CG_Project

Conflicts:
	src/model.cpp

	modified:   .gitignore
	new file:   src/model.cpp