Initial commit
Update .gitignore
Merge branch 'master' of https://github.com/Mozu/email-templates

Conflicts:
	.gitignore