Updating references.
Merge branch 'master' of github.com:DavePearce/Papers

Conflicts:
	references.bib