add new feature in fancy
more features on fancy
Merge branch 'fancy'

Conflicts:
	testGit/src/helloWorld.java