separating engine classes
Merge branch 'master' into engine_files

Conflicts:
	engine/engine.hpp
updating graphics.pro
Merge branch 'master' into makefiles

Conflicts:
	engine/engine.cpp
	engine/engine.hpp