first commit
added test.md
resolve conflict
Merge branch 'master' of https://github.com/ToraSonic/Test-Repo

Merge with github repo