fixing merge conflicts to update dev origin branch
fixing merge conflicts to update dev origin branch

dalrayes/writespeakcode.github.io,rachelober/writespeakcode.github.io,rachelober/writespeakcode.github.io,rachelober/writespeakcode.github.io,dalrayes/writespeakcode.github.io,dalrayes/writespeakcode.github.io