Merge origin/master

Conflicts:
	src/PatataClass.java