First commit
Merge https://github.com/germanmunuera/ProgrammingAssignment2