image upload works
resolved merge conflict in styles.css