Updated repo with local versions of files. Starting to think Github is kind of buggy though. In other words I can't figure it out, and had to make a new local repo first in order to merge it, haha.