gemfile
current users tours, now appear on new tour map
.
fixed wrong  number of arguments problem
Merge branch 'master' into fb_profile_pic_modal
Steven added some awesomem front-end stuffs
associated tourdesc opens in infowindow for user created tours
converted availability toggle to ajax
added ajax to become_ambassador button and dynamic display of ambassador_availability
removed precompiled assets
Merge pull request #76 from jpark3000/availability_button

Availability button
got simple modal to pop up
combined form submission for user profile and specialties using ajax."
Merge pull request #77 from jpark3000/edit_profile_ajax

Edit User Profile and Specialties via Ajax
Merge branch 'master' into advanced_css
Merge pull request #78 from jpark3000/advanced_css

Advanced css
can edit newly created pins on new_tour page
Merge branch 'master' into advanced_css
weird merge thing
Merge pull request #79 from jpark3000/edit_tour

Edit tour
Merge branch 'master' into advanced_css