camera now saves images
merging conflicts