display
Merge branch 'master' of https://github.com/awallef/caisse

Conflicts:
	caisse.js