updating file to show all changes are in master