Updating all changes made during stat290
merged files