Working on discussion
Merge branch 'master' of https://github.com/npasserini/2014-Wollok

Conflicts:
	Teaching.bib