gitignore updated
Merge branch 'master' of https://github.com/javiermanzano/static-html-handlebars-templating

Conflicts:
	.gitignore