Merge branch 'master' into advanced_css
Merge branch 'master' into advanced_css
Merge branch 'master' into advanced_css
avatar routing is complete
added ||= to profile_pic population
updated seed to populate profile pics
Merge pull request #92 from jpark3000/finish_avatar

Finish avatar
change homepage title and picture, move dropdown menu to correct location
finished login filter
Merge pull request #93 from jpark3000/before_filter

finished login filter
style pin popups on search results page
donezo
Merge pull request #94 from jpark3000/fix_search_results_link

donezo
style dropping and editing pins windows
add functionality for search input to expand on tours#new
resolve merge conflicts
hopefully fixed avatar loading problem
Merge pull request #95 from jpark3000/edit_new_tour

can edit newly created tours
facebook icon location
Merge branch 'master' into advanced_css