point light added to old code
Merge branch 'master' of https://github.com/KerryClav/graphics478
Merge branch 'master' of https://github.com/KerryClav/graphics478
Point lights trailing camera work... better
models updated
Lights added
this is stupid
Merge branch 'master' of https://github.com/KerryClav/graphics478

Conflicts:
	prototype/.DS_Store
	prototype/models/.DS_Store
	prototype/newproto.html
lights working but can't pass integer iscaught
silly DS_store file
Merge branch 'master' of https://github.com/KerryClav/graphics478

Conflicts:
	prototype/models/.DS_Store
	prototype/newproto.html
Merge branch 'master' of https://github.com/KerryClav/graphics478

Conflicts:
	prototype/models/.DS_Store
	prototype/models/test/.DS_Store