Last-ditch effort to fix Windows line ending nightmare
Merging new main file into repo