gitignore
Merge branch 'gh-pages' of https://github.com/dervondenbergen/placeholders into gh-pages

Conflicts:
	.DS_Store