added josh shell
Merge branch 'master' of https://github.com/pfraces/wed

Conflicts:
	README.md