rafa's merge
fixing build with sbt
running the project (right way)