changed object type to ArrayList
Merge branch 'Aaron' into David
Camera appears to be working

Tested, should work.