Commit 9
Merge remote-tracking branch 'upstream/master'

Conflicts:
	a.txt
Merge pull request #10 from bikashchoudhary/master

pull 9