Assignment 2 for coursera
Merge https://github.com/JavierAbascal/ProgrammingAssignment2