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
set height/width of map to specific pixels
so close
fix #map-canvas height, rename navbar, fix width %tage
rename instagram to root (more semantic), delete unused files & dragonfly.rb caused app errors
Merge branch 'master' of github.com:samvantran/ski-mountain-memories

Conflicts:
	app/assets/javascripts/snowfall.js
	app/assets/stylesheets/base_style.css
	app/views/trips/show.html.erb
mod js file
changed css of new trip form (still looks gross), fixed snowfall-canvas problem
added user profile pic and name to navbar on successful login (sexy); can also logout
spiderify working well
cleaned up code, removed unecessary routes and testing views
added dynamic links and hashtag to the navbar, what whattt
add attributes to Visual model to track user info
added show and stop timer to trip show page
added poor man's data viz for photos
tweak