la mansaca
Merge branch 'master' of https://github.com/nelargo/focastereo.git

Conflicts:
	config/routes.rb