Stephens update
Stephens update
adding untracked files
fixed merge conflicts