Fix merging snafu
Merge pull request #190 from XECDesign/dualcam

Fix merging snafu