Final Commit

Final version of Assignment 1