Camera button now brings up camera
Fixed merge conflicts which was just a few import statements