Added my name and emamil address
Fixed Conflict
Merge pull request #3 from taylortizzay/master

Added my name and emamil address