Small changes
Small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	oiltrack.iml
	src/main/java/fi/cohesive/oiltrack/Tank.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Enhanced the display of oil consumption.