+ reset
Merge branch 'master' of https://github.com/Parasithe/CoveoBlitz2014
Merge branch 'master' of https://github.com/Parasithe/CoveoBlitz2014

Conflicts:
	search.js
! fixed merge