adding photo upload
fixed home merge