merge so that i can copy files in

github is not letting me do wanything in the branch for some reason som im trying to merge it