first commit of assignment 2
Merge https://github.com/oscarmath/ProgrammingAssignment2