before merge
merge conflict
Merge pull request #2 from tihuan/master

Master