moved end button
dashboard show
alicia edits on dashboard
took matt settings button back into dashboard
starting to make your itinerary work
columns nesting properly in itineraries show
itinerary show
Merge remote-tracking branch 'origin/master'
Merge branch 'alicia'