primeiro commit
Merge branch 'master' of github.com:agripinoduarte/velha-php

Conflicts:
	.gitignore