Pull request Borja

Added all my homework except the paper's review.