Worked on scene handling.
Merge branch 'master' of github.com:wanze/GameDevProject