Removed requre omniauth-instagram from environment.rb
Merge branch 'master' into development
Merge branch 'master' into grab_instagram_images
Added instagram_image path in actions.rb that will return instagram images based on the lat and long of uploaded image
Merge branch 'grab_instagram_images' into development
ready to push to master
login
Merge branch 'login' into development
Implemented google map and managed to show marker of user's pictures with markers for surrounding photos. Have also implemented paths from origin pic to the surrounding pics
Merge branch 'plot_google_map' into development
Added plog_google_map v1
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