Dunno
Merge branch 'master' of github.com:Darkhogg/IGr-Pract6

Conflicts:
	camera_scene.cpp
	camera_scene.hpp