stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project1/LINUX_OR_MINGW/scene-start.cpp
Merge remote-tracking branch 'upstream/master sadasdas
Fixing of deleting and switching obj
Merge pull request #11 from Callum-/master

Fixing