Assignment5

Assignment5
Merge pull request #16 from kainruben/master

Assignment5 Ruben Romero
Merge pull request #256 from jchanam/master

OK