Updated intro and related work.
Merge branch 'master' of https://github.com/gronat/work

Conflicts:
	nips2014.aux
	nips2014.log
	nips2014.pdf
Commit
Commit.