Update index.html

Was still the index.html file for adamBranch so edited it back to original.
Updated camera - copy from adamBranch

Same update from a moment ago except for development branch camera.
Updated camera.js to fix truck()

Same changes Jeff made in Master. At least the changes I noticed on quick glance.
Merge commit '0fa52cda088dce1230c5442a6082822d99a32124'

Conflicts:
	Project2/camera.js
	Project2/index.htm
BUT THEY'VE BEEN RESOLVED! DON'T PANIC
l