Nueva version
Merge branch 'master' of https://github.com/purplelau/TFG

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/SACTT-GUI/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SACTT-GUI/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/SACTT/.indexes/e4/7a/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SACTT/.indexes/e4/ed/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SACTT/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.api.tools.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wb.core.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.jdt.core/1452858696.index
	.metadata/.plugins/org.eclipse.jdt.core/778322429.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SACTT-GUI/2014/3/10/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SACTT-GUI/2014/3/10/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	SACTT-GUI/.classpath
	SACTT-GUI/src/FrameAñadirArea.java
	SACTT-GUI/src/FrameAñadirCategoria.java
	SACTT-GUI/src/consultaGUI.java
	SACTT/.classpath
	SACTT/bin/Lema/lema.class
	SACTT/src/Area/area.java
	SACTT/src/Categoria/categoria.java
	SACTT/src/IdPalabra/idPalabra.java
	SACTT/src/Lema/lema.java
	SACTT/src/LemaRasgo/lemaRasgo.java
	SACTT/src/OtrasFunciones/consulta.java
	SACTT/src/RasgoContenido/rasgocontenido.java
	SACTT/src/categoriasLemas/categoriasLemas.java