My first commit
Merge branch 'master' into vicente
Adds new line
Fix merge