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

Conflicts:
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ABARS/.markers
	.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.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/402730848.index
	.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
	.metadata/.plugins/org.eclipse.jdt.junit/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml