sdf
Merge branch 'master' of https://github.com/sondreli/placeholder-site

Conflicts:
	views/main.html