Windows git
Merge branch 'master' of https://github.com/Squiercg/algprog

Conflicts:
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/aulas/.markers
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.jdt.core/3323604824.index
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	lpoo/Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml