Added winmerge .bak files to .gitignore
Unified head and foot matter
Refactored