Cambios en MEscenario
Merge branch 'master' of https://github.com/Jonazan2/Oasis.git

Conflicts:
	gen/com/example/oasis/R.java