Added the new free book "Recipes with Angular.js"
fix conflicts