d
Merge branch 'master' of github.com:jakecrump/design

Conflicts:
	test.py
Merge branch 'master' of github.com:jakecrump/design