Merge branch 'test_branch'
second branch test
Merge pull request #2 from adellecharles/test_branch_2

Test branch 2