things i changed
1. get user#show to resources
2. add current user to trip on trip#create
3. added _usertrips partial
4. added user show page
5. added session[user_id] to sessions create
6.   inserted puts "$$$$$$$$$$$CURRENT TAG: #{current_tag}" into subcallback to track the random errors

todo :we need to destroy subscriptions on log out
Merge branch 'master' into user-show-pageJJK

Conflicts:
	app/controllers/sessions_controller.rb
added user show page functionality (shareable link ha ha), and 1. added destroy_subs to user class
created about and team routes, pages, and some Jquery AJAX
about page and team page's updated
added show and stop timer to trip show page
added poor man's data viz for photos
tweak
Merge branch 'master' of github.com:samvantran/ski-mountain-memories

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/controllers/instagram_controller.rb
	app/views/instagram/new.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
saving
merged Sam's final
merged user show with master