completed assignment 2
Merge ProgrammingAssignment2
done