added name
Merge pull request #1 from skylersb/master

added name
merges upstream with my local