Merge origin/master

Conflicts:
	Practice/src/test/HelloWorld.java