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