Ping
Merge branch 'master' of github.com:Parasithe/CoveoBlitz2014

Conflicts:
	package.json