touched
2nd feature dev
3rd feature dev
Merge branch 'feature/test' into develop
Bumped version number to 1.0
Merge branch 'release-1.0'