third, testing branching
4th
DESIGN
add
del plan.txt
Merge branch 'master' into ldev
readme change
Merge branch 'ldev' into dev

Conflicts:
	plan.txt
solution 
del plan.txt