pyc
delete conf.pyc
Merge branch 'master' of https://github.com/zhcn/amazon

Conflicts:
	conf/conf.pyc