modif
Merge remote-tracking branch 'origin/master'

Conflicts:
	Videos.html
Merge branch 'master' of https://github.com/kivnek69/API