master
 rebase new file
 rebase change master txt
Merge pull request #1 from adamilardi/rebase

Rebase merge in
 merge before pull fixed conflict