image
Merge branch 'master' of git@github.com:zot/Leisure.git
Merge branch 'master' of git@github.com:zot/Leisure.git

Conflicts:
	www/images/artdecoborder.JPG
Merge branch 'master' of git@github.com:zot/Leisure.git
adding new test gauge icon files