Model and terrain
Merge branch 'master' of https://github.com/gerardsimons/CGA_Game