added text file
New file from b
Merge branch 'b' into develop
file from c
yea
Merge branch 'c' into develop
bumped version to 1.0
Merge branch 'release-1.0'