flag login
Merge branch 'master' of github.com:vlaguzman/photo-album
merge total henry changes
errors fixed