wtf
Merge branch 'master' of github.com:Light-Keeper/CAD_Coursework
render, not finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	CommonPlugins/GUI_CLR_loader/clr_loader.cpp
rendered_map_v_1
conflict resolved