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

# By Courtney Fennell (1) and unknown (1)
# Via Courtney Fennell
* 'master' of https://github.com/bazaalejandro7/ABARS:
  no message
  no message

Conflicts:
	.metadata/.log
	.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/.root/2.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.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/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/version.ini
	.recommenders/caches/identified-project-coordinates.json