yet another commit
Merge https://github.com/cezarmih/ProgrammingAssignment2