show date on timeline
merge conflict
Merge pull request #58 from kaitlinhuben/eh-timeline

date on timeline
Merge pull request #59 from kaitlinhuben/kh-edit-itinerary

Collision bug fix & displaying id to user
Condensed the change name/delete itinerary buttons, some other style fixings
fix merge conflicts. also got rid of some bugs
Merge pull request #60 from kaitlinhuben/eh-timeline

Bug/Timeline fixes
search by name implemented
Merge pull request #61 from kaitlinhuben/eh-search-by-name

search by name implemented
Bugfix: editing name of itinerary
Consistency: sample page says copy instead of use

Also green button like on existing itineraries page
Bugfix: prepopulate; changed samples to 2014