photo upload in progress
modified readme
modified readme
jquery file upload in progress
resolved conflict