Generated by bundle
Merge branch 'master' of github.com:ftomassetti/html-lightmodels

Conflicts:
	.gitignore
	README.md