no message
Merge branch 'master' of https://github.com/bazaalejandro7/ABARS

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/402730848.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
	.metadata/version.ini
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.fdt
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.fdx
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.fnm
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.frq
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.nrm
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.prx
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.tii
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_5.tis
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.fdt
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.fdx
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.fnm
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.frq
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.nrm
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.prx
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.tii
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_6.tis
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.fdt
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.fdx
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.fnm
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.frq
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.nrm
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.prx
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.tii
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/_7.tis
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/segments.gen
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/segments_8
	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/jre/jre/1.0.0-SNAPSHOT/resolver-status.properties
	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/org/eclipse/recommenders/index/0.0.0-SNAPSHOT/resolver-status.properties
	ABARS/bin/MainFrameGUI.class
	ABARS/bin/Starter.class
	ABARS/bin/Student.class