Changing file names
changing name of window
Merge branch 'Assignment2'