commiteando
Merge branch 'master' of https://github.com/Daniel-Carreto/TengoHambre

Conflicts:
	app/src/main/java/com/systemboy/tengohambre/BaseActivity.java