added testingMergeProblems5
added testingMergeProblems6
Merge branch 'pedja'

Conflicts:
	HelloWorld/src/CompletlyNewClass.java