Ignore an autogened html file
Merge branch 'master' of github.com:geeksville/arduleader

Conflicts:
	common/src/main/webapp/.gitignore