modified:   build.xml
	modified:   build.xml
	modified:   build.xml
	modified:   build.xml
build/
	phpunit.xml.dist
Merge branch 'master' of https://github.com/julianamartins/teste

Conflicts:
	build.xml

	build/
	phpunit.xml.dist
	new file:   build/phpcs.xml
	new file:   build/phpmd.xml
	new file:   phpunit.xml.dist