Merge pull request #1 from patrickg2014/master

Updating Master
Add view for displaying camera info
Merge pull request #2 from patrickg2014/Patrick

Patrick