second commit
started work on feature 1
more work on feature1
feature2
more feature changes for feature 2
Merge branch 'feature/feature-001' into develop
Merge branch 'feature/feature-002' into develop

Conflicts:
	README.md
release 1.0
Merge branch 'release/1.0'