trying to fix bug
text changes to fix jshint fail
another bugfix text change
lots of text and journey changes
more text fixes
more text fixes still
ditto
ditto
ditto
merge conflict resolution