Yield moved into wrapper
Merge branch 'master' of https://github.com/dunyakirkali/osizer

Conflicts:
	app/views/layouts/application.slim