Ajustes
Merge branch 'master' of https://github.com/matheusgg/rugrat.git

Conflicts:
	rugrat/resources/rugrat.log