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