add demo
fix conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Practice/src/Test.java