Merge branch 'master' of https://github.com/Samitier/iaHelicoptersSalvament

Conflicts:
	src/salvament/Helicoptero.java