Finally doing a good
Merge remote-tracking branch 'upstream/master'

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

Finally doing a good