sending files
Merge branch 'master' of https://github.com/marcelobarreto/vota_prato

Conflicts:
	.gitignore