Updates of 6 Exercises
Merge branch 'master' of https://github.com/cllin/ProgrammingExercises

Conflicts:
	src/com/cllin/main/Main.java