delete bad merge file, hopefully fixes heroku
recompiled for heroku
updated the items feature page to create a new itinerary withe current item if there's none to add it to
adjusted show page with some logic to add OR edit based on current user
show page edit almost working
updated the itineraries item edit page to redirect back to user itineraries
pushing to heroku
stupid hobbitses
fixed the styling
not happy with styling breaks
disaster
styling update
fixing register field
register styling is done, there are some issues with the grid
white drop shadows on text
improved form styling on new itinerary
adjusted styling on forms, changed buttons
huge fight to get red buttons on login page
adjusted padding, converted all to Helvetica
border radius is back