Merge branch 'master' of https://github.com/Anika1/Pictor

Conflicts:
	Pictor/PaintingView.m
Width capabilities
Merge branch 'master' of https://github.com/Anika1/Pictor

Conflicts:
	Pictor/PaintingView.m
h
head/fetch-head??