first commit
Merge github.com:tanfeng/market

Conflicts:
	.gitignore
Merge github.com:tanfeng/market