Working on camera
Added camera
Merge remote-tracking branch 'upstream/master'
Add camera
Merge pull request #28 from tp9/master

Added camera