revert2
Merge branch 'master' of https://github.com/ludovicbonivert/bookwurm

Conflicts:
	src/ehb/cp2/bonivert_ludovic/boeken/BoekenTestApp.java