adds images
fixes home conflict
fixes conflicts
adds link on camera page
fixes conflicts