for pull
for pull
Merge branch 'master' of github.com:plancien/learning-engine

Conflicts:
	public/scripts/game_types/pikaPictures.js
Merge branch 'master' of github.com:plancien/learning-engine
Merge branch 'master' of github.com:plancien/learning-engine
Mise au propre simba.js
Merge branch 'master' of github.com:plancien/learning-engine