update camera
Merge branch 'master' of https://github.com/sytianhe/CS5625Final-Project
merge
Merge branch 'master' of https://github.com/sytianhe/CS5625Final-Project

merge
parallax experiment
merge changes