Add my name to Readme file
Resolve conflict
Resolve conflict
Merge pull request #17 from BeshoSmile/Madeleine7884_GitTask

Madeleine7884 git task