adding new scene
trying to merge
Merge branch 'master' of https://github.com/zackm/CS184_Final_Project