Gráficos

Gráficos criados
Merge branch 'master' of https://github.com/jjcorrea/functional-group

Conflicts:
	hello-play-scala/.cache
	hello-play-scala/app/controllers/Application.scala
	hello-play-scala/app/model/Detail.scala
	hello-play-scala/app/views/showDetail.scala.html