typologie
Merge branch 'master' of https://github.com/ecal-mid3-2014/improv-crowdsourcing

Conflicts:
	story.txt