no message
Merge branch 'master' of https://github.com/Corentinfardeau/NewYorkTimes

Conflicts:
	app/scripts/directives/card.js