.
Merge branch 'master' of github.com:josago/NLP1_2014

Conflicts:
	Report-added-derivations.pdf
	Report-added-derivations.tex
Merge branch 'master' of github.com:josago/NLP1_2014
Merge branch 'master' of github.com:josago/NLP1_2014
Added final versions of presentation and image.