Merge remote-tracking branch 'origin/one'
Merge branch 'master' of https://github.com/masterslayer/merging
Merge remote-tracking branch 'origin/three'
added 29
added 30
added 31
added 32
Merge remote-tracking branch 'origin/one'
Merge remote-tracking branch 'origin/three'
added 40
added 41
Merge branch 'master' of https://github.com/masterslayer/merging into three