.gitignore
Committing
Merge branch 'feature/testfeature' into develop
merging 'feature/feature2' into develop
merging 'feature/2' into develop
merging 'feature/2' into develop
updating poms for 1.0 release
updating poms for 1.0 release
Merge branch 'release/1.0'