update commit
update commit
merge requirement.
ignore DS.Store
ignore .conf
ignore again
add requirement
aaa
111
1111
merge with shuai
merge with rtong
update database
Merge branch 'master' into rtong

Conflicts:
	.gitignore