merge in master, add html files, redirect