Adding to the git itnore
Reading the make manual taught me about .PHONY targets, adding
fixing merge conflict
Removing swap files from the repo
Adding a ~ exclude to the .gitignore so that garbage doesn't get committed here
removing swap from root