Bonito!
Merge branch 'master' of https://github.com/NivxB/project3_ED into NivxB-master

Conflicts:
	project3/build/built-jar.properties
	project3/build/classes/project3/Project3$1.class
	project3/build/classes/project3/Project3$2.class
	project3/build/classes/project3/Project3.class
	project3/src/project3/Project3.java
Merge branch 'NivxB-master'

Conflicts:
	project3/build/built-jar.properties
	project3/build/classes/project3/Project3$3.class
	project3/src/project3/Project3.java