add dev branch
from feature1
nothing
merge with no-ff
from feature1 by 3
from feature1 by3
Merge pull request #1 from Phelthas/dev

Dev