this is new master
branch
merge with no-ff

Conflicts:
	readme.txt
add 1
2
branch dev
merge with no-ff
add gitskills
fix bug 101
merged bug fix 101