fixed some errors
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project1/LINUX_OR_MINGW/scene-start.cpp
Merge pull request #15 from Callum-/master

fixed some errors