DS

DS
Merge branch 'gh-pages' of https://github.com/martndes/static into gh-pages

Conflicts:
	.DS_Store