expensesss
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml
Expense AlertDialog updated
commit before pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/project/firefly/ActivityCheckout.java
	app/src/main/res/values/strings.xml
revert pul then merge
Merge branch 'master' of https://github.com/dionellorera/Firefly
revert pul then merge
revert pul then merge