staging env fun
Merge branch 'smoke' of https://github.com/palin/blog

Conflicts:
	app/views/layouts/_header.html.haml