commit two
Merge branch 'master' of https://github.com/raychensg/Yellowfin

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.projects/Yellowfin/.marke
rs.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/Yellowfin/.synci
nfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
Merge branch 'master' of https://github.com/raychensg/Yellowfin

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.projects/Yellowfin/.marke
rs.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/Yellowfin/.synci
nfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png