gitignore
Merge branch 'soilwat-v30' of https://github.com/Burke-Lauenroth-Lab/SOILWAT into soilwat-v30

Conflicts:
	.DS_Store
	testing/.DS_Store