Fixed the git trouble, this is my first project with git, so...