added a new file
Merge branch 'master' of http://github.com/luckysahani/sample1
hello
Merge branch 'master' of https://github.com/luckysahani/sample1 into 1
commit 2
chutiya lucky
conflict resolved