Merge branch 'chrislocal'
Merge branch 'chrislocal'
Merge branch 'chrislocal'
Revert "updated text"

This reverts commit 737870a243d741304dc268c29fee30b64fc97dc6.
Merge branch 'master' into chrislocal

This reverts commit 737870a243d741304dc268c29fee30b64fc97dc6.