Merge branch 'release/3.0' into develop
add a new file to say hello
fix a bug on 4th feature
Merge pull request #3 from michaelbaudino/feature/plop

Feature/plop