webapps
Creating template
Merge remote-tracking branch 'openshift/master'
Creating template
My changes
Some commit message
Some commit message
mudando algumas coisas
Merge branch 'master' of
ssh://iniciativaverde-matafe.rhcloud.com/~/git/iniciativaverde

Conflicts:
	.DS_Store
	pom.xml
	src/main/webapp/WEB-INF/web.xml