Merge branch 'master' of https://github.com/villu164/SoneOtsing

Conflicts:
	src/Punkt.java
	src/Test.java
Merge branch 'master' of https://github.com/villu164/SoneOtsing

Conflicts:
src/Punkt.java
src/Test.java
Merge branch 'master' of https://github.com/villu164/SoneOtsing

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	log.txt
	soned.txt
	src/Loe.java
	src/Paiguta.java
	src/Punkt.java
	src/Test.java