Working but ugly version.
Merge branch 'master' of https://github.com/nickbarnwell/margin

Conflicts:
	core/src/margin.ts