Changed the words table to a 4-columned table.
Merge branch 'master' of github.com:josago/NLP1_2014

Conflicts:
	nips2014-report.pdf
Wrote the disccusion, acknowledgements and work distribution.
AcknowledgEments*
Merge branch 'master' of github.com:josago/NLP1_2014

Conflicts:
	nips2014-report.pdf
	nips2014-report.tex