Fixed file paths for a public deploy
Merge remote-tracking branch 'origin/master'