Working on sending images via POST
Fixed merge conflicts.