Merge pull request #2 from dineshshetye/version-1_0-stable

Merge pull request #1 from dineshshetye/master
Demo File
Merge pull request #3 from dineshshetye/b1

Demo File
Demo file 2
Modified Demo2.
Merge branch 'b1'
first commit for info.txt
Merge pull request #5 from dineshshetye/b2

Looks good. Merging info.txt with master.
Updated file.
Modified as a Merge conflict example.
Merge pull request #6 from dineshshetye/b2

Updated file.
Fixed merge conflicts
Merge branch 'version-1_0-stable'