changes before christina pull
Merge branch 'master' of github.com:KorenLeslieCohen/travel-journal
mandrill not working yet
mandrill mailer is workinggggg
Merge branch 'master' of github.com:KorenLeslieCohen/travel-journal
mandrill working
mandrill temporary template up with trip details
added seed data, fixed form checkboxes, worked on styling, etc.
problem with modal2
calculator working again
fixed merge conflicts
fixed merge
form
date field
started making buttons
hovers
calendar in app, no button shows working