that should help Will
gitignore
merged