Rebasing changes

Conflicts:
	LearnJ/src/com/dj/example/Sorting.java
	LearnJ/src/com/dj/example/StringSamples.java
Fix and rebase

Conflicts:
	LearnJ/src/com/dj/example/Sorting.java
Tree, String, Factors examples
String, Thread, Sorting examples

Conflicts:
	LearnJ/src/com/dj/example/Sorting.java
String, Thread, Sorting examples

Conflicts:
	LearnJ/src/com/dj/example/Sorting.java
String, Tree, Sorting example Merge
Fix Merge and classpath
Remove duplicate files
Merge branch 'master' into temp_mainline