added camera feature
Merge branch 'master' of https://github.com/AdilVirani/freezeRay

Conflicts:
	www/index.html