Added Camera class.
Added Camera class
Fixing merge conflict