update
Merge branch 'master' of https://github.com/jkaashoek/PRIMES-Sudoku

Conflicts:
	paper/main.aux
	paper/main.log
	paper/main.pdf