keo
Merge branch 'master' of https://github.com/evsheino/TravelExpenses

Conflicts:
	src/main/java/wad/domain/Expense.java

Merging attempt.