training
Merge branch 'master' of https://github.com/viccivicky/side-projets

Conflicts:
	Gallery/app/js/gallery_NoPlugIn.js