FUCKING DONE
Merge branch 'master' of https://github.com/Phoniks7/Computer-Graphics-Project

Conflicts:
	core.cpp