added CameraVideo class
modified camera picture class
resolved conflict in camera_picture
Merge branch 'master' of github.com:marianitadn/kidsberry
added CameraVideo class
Merge branch 'master' of github.com:marianitadn/kidsberry