g
Merge branch 'master' of github.com:ANLES128/GLO3102

Conflicts:
	inscription.html
Merge branch 'master' of github.com:ANLES128/GLO3102
Responsive
Responsive
Merge branch 'master' of github.com:ANLES128/GLO3102

Conflicts:
	api/files/users.json
	index.html