add something in branch
dev and master
fix conflict
add in dev
Merge pull request #1 from curarchy/dev

Dev