Quick update -- WILL NOT BUILD --
Merge branch 'master' of https://github.com/Bobhostern/Disandria
Removed Scene. Preparing to redo it.
Conflicts:
	src/lib/Scene.cpp