inital landing page- guest button
login
Merge branch 'login' into development
sliding panel
Merge branch 'sliding-panel' into dev
Merge branch 'development' into plot_google_map
last 5 pictures feature
Merge branch 'features' into development
conflict resolution
Added new feature: managed to show instagram thumnails on the map and they are clickable to show bigger size img
Merge branch 'plot_google_map' into development
conflicts
Fixed conflict merging with Maz
Merge branch 'development' into plot_google_map
deleted ds store
adding upload panel
adding extra bootstrap files
Merge branch 'upload-panel' into dev
ascending location
conflict resolution merges