Rebased site-redesign to resolve merge conflicts. Not sure if we really want to keep them, but this drops all the merge commits. It might be safer to resolve conflicts by merging master into site-redesign instead.
Decided not to do a rebase to keep the merge commits.
Rebasedsite-redesignto resolve merge conflicts. Not sure if we really want to keep them, but this drops all the merge commits. It might be safer to resolve conflicts by mergingmasterintosite-redesigninstead.Decided not to do a rebase to keep the merge commits.