added file cogsci_metaphor_submitted
Merge branch 'master' of https://github.com/justinek/metaphors

Conflicts:
	Paper/cogscipaper/cogsci_metaphor.tex