Assignment2

Complete with both functions