Borrados ficheros conflictivos de git
Merge branch 'master' of https://github.com/eltsdev/hotelmania

Conflicts:
	simulation/APDescription.txt
	simulation/MTPs-Main-Container.txt
commit