add design#2
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/design.pdf