Merge pull request #1 from evildmp/master

merging with upstream
added name via terminal
Merge pull request #2 from evildmp/master

merging with upstream
amend my name
fix merge conflict
Merge pull request #85 from davideire/amend-my-name

Amend my name
Merge remote-tracking branch 'upstream/master'