Sombrejo ajeitado
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamejam/assets/sombrero.png