add skill
dev
master
Merge branch 'dev'

Conflicts:
	README.md
devdev
fix
add dev
new line
merge
new line
after merge
3 dev
add master
one more master
merge