modify it from dev branch
Merge branch 'dev_branch'
yes
Conflicts:
	main.c
Merge branch 'dev_branch', remote-tracking branch 'origin/HEAD' into dev_branch
all
Conflicts:
	main.c
add mydev.c
s
Merge branch 'dev_branch' of https://github.com/zhengling1201/Hiscms

Conflicts:
	main.c