new JS to use the camera
Merge branch 'master' of https://github.com/Coquemosh/Project1

Conflicts:
	js/API/eventos.js