login
Merge branch 'login' into development
last 5 pictures feature
Merge branch 'features' into development
conflict resolution
Merge branch 'plot_google_map' into development
conflicts
deleted ds store
Fixed conflict merging with Maz
Merge branch 'development' into plot_google_map
Added latest version of plot google map