no message
Merge branch 'master' of
https://github.com/rafaelgoncalvs/designpattern.git

Conflicts:
	padroes.txt