gitignore 2
teste

Merge branch 'master' of https://github.com/abjur/vistemplate

Conflicts:
	.gitignore
gitignore
temp to add directory