Modified blackfriday for wiki
conflicts repaired