Assignment 1 Final Commit

Last commit for assignment #1