dded fvanwesterop
Merge branch 'master' of https://github.com/mbeelen/quango

Conflicts:
	README.md