mariana test conflict
Merge branch 'gh-pages' of https://github.com/tfoote/design into gh-pages

Conflicts:
	index.md