initial commit
Merge ProgrammingAssignment2