initial commit
Merge https://github.com/rscoones/placeholder