Yellow Function
Yellow now in test
Merge branch 'Yellow'

Conflicts:
	test.cpp