Updated skybox.
Solved conflicts.
Merge pull request #8 from connienguyen/master

merging to master