test
Merge branch 'master' of https://github.com/rekola/canvas

Conflicts:
	src/ContextQuartz2D.h