gitignore
ignorados directorios
Merge branch 'master' of https://github.com/carlisgg/120minutes

Conflicts:
	eclipse/classes/ApplicationTest.class
	eclipse/classes/BasicTest.class
	eclipse/classes/MasOfertadosTest.class
.settings ignorado