Nothing much
Merge branch 'master' of https://github.com/sondreli/placeholder-site
fixed merge