fixed merge conflicts
Merge pull request #36 from kaitlinhuben/mandy

Mandy
fixed merge conflicts
Moved old files
Merge pull request #46 from kaitlinhuben/kh-multiple-itineraries

Moved old files
User can copy sample itinerary for their own

Existing itineraries page also differentiates between sample itineraries
and user generated itineraries
Merge pull request #47 from kaitlinhuben/kh-sample-itineraries

User can copy sample itinerary for their own
Sample itinerary redirect

If user tries to access itinerary.html?id=sampleID, redirects to
sample-itinerary page so can't edit
Likewise, if accidentally gets to sample-itinerary.html?id=notSampleID,
redirects to itinerary.html for editing
Error checking on existing storage

Pages check whether anything has been stored yet; if so, parses existing
stored JSON, otherwise writes sample itineraries to storage
Merge pull request #48 from kaitlinhuben/kh-edit-itinerary

Integrating storage
Added Dishoom and British Museum to London itin.
User can update itinerary name

Doesn't write to storage yet
User can delete itinerary from edit page
Merge pull request #49 from kaitlinhuben/kh-edit-itinerary

Updates from itinerary view page
added the about page and added some css for it
collosion mod