test
test
Merge branch 'master' of https://github.com/hullumaja/waltercalc_mobile

Conflicts:
	www/index.html