Some changes to the intro
Merge branch 'dev' of github.com:NYUCCL/psiTurk into dev

Conflicts:
	doc/cogsci_workshop/index.html
More changes in the intro