modify conf.py
Merge remote-tracking branch 'mdiener21/golfgis' into md_branch

Conflicts:
	newdocs/conf.py
modified index
add index
add folder contribute
add files
changes
deleted
deleted
delete
deleted
deleted
deleted
modify
modify
modify
modify
modify
modify
modify