modified .gitignore
merge

Merge branch 'master' of github.com:cvitolo/BasicTemplates

Conflicts:
	.gitignore