modified:   .gitignore
deleted:    hanyuqiao/__init__.pyc
deleted:    hanyuqiao/admin.pyc
deleted:    hanyuqiao/adminx.pyc
deleted:    hanyuqiao/api.pyc
deleted:    hanyuqiao/models.pyc
deleted:    hanyuqiao/settings.pyc
deleted:    hanyuqiao/test.pyc
deleted:    hanyuqiao/urls.pyc
deleted:    hanyuqiao/wsgi.pyc
deleted:    data.db
Merge branch 'master' of github.com:hungerr/hanyuqiao

Conflicts:
	.gitignore