Initial commit
Merge branch 'master' of github.com:lperardi/GitMerging2