mako camera
Merge branch 'cm' into mako-dna
tying out mako
fixing messed up git commit for camera
fixing messed up git commit for camera part 2
cleanup