sa
dsadd

Please enter the commit message for your changes. Lines starting
bootmgr
BootApplication
ds
setting
bar
dssd
Merge branch 'BootManager' of github.com:liufeiit/itmarry into BootManager
merge dev Merge branch 'dev'

Conflicts:
	.gitignore
Merge branch 'BootManager'