gitignore
My initial commit
Merge branch 'master' of github.com:blel/Promoveo

Conflicts:
	.gitignore