please work
Merge branch 'master' of https://github.com/raychensg/Yellowfin

Conflicts:

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs
name