added mountain and forest stuff, beware of bug that sometimes happens
Merge branch 'master' of github.com:bensechrist/civ-simulator

My compooter iz sooo smart