Making sure up to date
Merge branch 'dev' of github.com:YasminRazavi/photo_sharing_app into dev
Getting Yasmin's changes