Dans commit
trying to fix merge
Merge branch 'master' of github.com:trostli/sample_app_v2
1st commit