complete
Merge https://github.com/lily-white/ProgrammingAssignment2
complete