Repaired Scene
Merge branch 'master' of https://github.com/tim427/minorproject