branch commit
dasfd
Merge branch 'development' of https://github.com/juanpsm79/mavengit.git into development
aa
oo
hh
Merge branch 'development' into funcional1

Conflicts:
	src/main/java/com/github/maven/example/Widget.java