reset asset and add new gitignore
commit
Merge branch 'master' of github.com:zhanglun/mywebpy

Conflicts:
	.gitignore