Uploading Pictures
Merge remote-tracking branch 'origin/dropboxattempt'