rename
rename
Merge branch 'master' of https://github.com/adrianojlt/designPatternsInJava.git
Merge branch 'master' of
https://github.com/adrianojlt/designPatternsInJava.git

Conflicts:
	designPatternsInJava/src/pt/adrz/designpatterns/Main.java
...