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