changes to competences
boutons
Merge branch 'master' of github.com:apontecolina/Hackaton

Conflicts:
	public/competences.html