Modelo en n-capas (chungo)
Merge branch 'master' of https://github.com/Arquisoft/ObservaTerra41

Conflicts:
	.classpath
	app/views/index.scala.html