Add my new branch
resolve conflits
Merge pull request #19 from BeshoSmile/John2392_GitTask

John2392 git task