successful run with new resilience layers by Katie
Merge branch 'master' of https://github.com/OHI-Science/ohi-israel

Conflicts:
	med2014/calculate_scores.R
	med2014/launch_ohi-israel.R