All files to master

Tested links on machine, hope to work on Master from here on out.