add pydiction
Merge branch 'master' of github.com:freejie/myubuntu

Conflicts:
	sources.list