Added my name
Merge pull request #299 from machinelady/add-name

Added my name
fixed merge conflict