Added swps to gitignore
Added previous and next links
Fixed merge conflict