Assignment3

Assignment 3 completed, so merge3 back to main