Working on Firefinder project
Merge branch 'master' of https://github.com/zakirhere/EclipseProject

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.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/805392562.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
merging