Update .travis.yml
Merge branch 'master' into Expenses
editing and deleting expense