added my_app
added my_config
added my_hash
Merge branch 'my_app' into develop
Merge branch 'my_config' into develop
Merge branch 'my_hash' into develop