iblea
Merge branch 'master' of https://github.com/lverweijen/datavis3

Conflicts:
	practicum3/script/globals.js