--Commit 10/02, Joshua
Merge branch 'master' of https://github.com/hubte1g/ProgrammingAssignment2