Change made in branch A
Merge pull request #1 from Wolox/A

Change made in branch A