books and articles scaffolded
Merge branch 'master' of https://github.com/CandB/munanashampurilainen

Conflicts:
	config/routes.rb