Applying_Stylesheet--Dao__LivroDao.php
GitIgnore test
Metadata Eclipse
Gitignore
Applying_Stylesheet
Applying_Stylesheet--Dao__UsuarioDao.php
Merge branch 'Applying_Stylesheet--Dao'

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/SeboEletronico/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SeboEletronico/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.dltk.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.dltk.core.index.sql.h2/model.1.log.db
	.metadata/.plugins/org.eclipse.dltk.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	SeboEletronico/.gitignore
	SeboEletronico/Dao/LivroDao.php