Merge pull request #1 from evildmp/master

merging from evildmp master
adding my name via command line git
Merge pull request #1 from evildmp/master

merging upstream to master
Added my name
merge larryone
merge Sam