Merged the two files successfully

Also made buttons global and other such things