Estudio Interactivo terminado
Merge branch 'master' of https://github.com/Jonazan2/Oasis.git

Conflicts:
	src/com/modelos/MEscenario.java
	src/com/vistas/VSplash.java