Added Yahoo
Merge branch 'master' of https://github.com/ffoh/admin

Conflicts:
	direct_route.sh