More updates, trying to get git working. Considering abandoning the use of git.
Merge remote-tracking branch 'refs/remotes/origin/master'