a
Merge branch 'master' of https://github.com/wwwiiilll/CoveoBlitz2013
Merge branch 'master' of https://github.com/wwwiiilll/CoveoBlitz2013

Conflicts:
	datastore/index.js