Merge pull request #8 from bikashchoudhary/master

commit hi5
Merge pull request #9 from bikashchoudhary/master

Commit 8
Commit 10
Merge remote-tracking branch 'upstream/master'

Conflicts:
	a.txt