Update to assignment 1

Ready to be reviewed and turned in