Salvar al soldado Senglar
Merge branch 'master' of https://github.com/SenglarSalvatge/WebsAlPunt_rutes

Conflicts:
	.gitignore
	.pydevproject