renamed my file
markdown
Resolve conflict
Merge pull request #19 from githubteacher/vinh

renamed my file