Added Camera Functionality
Commit before pull, bad comments chris
merging master into weather2