Probando git 2
Merge branch 'master' into lalala

Conflicts:
	src/cl/dcc/cc5303/Rectangle.java