Initial commit comment
Merge branch 'master' of https://github.com/jurnix/vic-simulation

Conflicts:
	.gitignore