initial wordpress with samantha
fixed merge conflicts