brodboksen
Tull
Merge branch 'master' of https://github.com/thoberre/brodboksen

Conflicts:
	Gemfile.lock
	app/views/pages/index.liquid.haml
	log/wagon.log
try
clean