initial commit
Merge branch 'master' of https://github.com/penrosestudio/margin

Conflicts:
	README.md