New camera logic
Merge branch 'master' of https://github.com/damienb/viruscircuit
Merge branch 'master' of https://github.com/damienb/viruscircuit