Merge remote-tracking branch 'origin/master'

Conflicts:
	competences.html
	index.html