a commit
Merge branch 'master' of https://github.com/TheYves/jallaSelect

Conflicts:
	scripts.js
cleanup