Merge
Merge branch 'master' of https://github.com/guipimenta/MoedasModule

Conflicts:
	.classpath
	src/MoedasModule/Moedas.java
Retirando problemas de mesclagem
Merge branch 'master' of https://github.com/guipimenta/MoedasModule.git

Conflicts:
	.classpath