buggfix
buggfix Merge branch 'master' of https://github.com/TetraPakGit/co2calculator

Conflicts:
	bin/CO2Web.dll