Finished edits
Merge branch 'master' of https://github.com/ibarreto/image-sharing-system