added more world gen options
Merge branch 'master' of https://github.com/jmknox/FDM170a_Final_Project