Updated this file

Added my name to this file.
fixed conflict
Merge branch 'hackfoo-add-my-name'