jjj
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/laiaisern/mati.git
hh
Merge branch 'master' of https://github.com/laiaisern/mati.git
kk
Merge branch 'master' of https://github.com/laiaisern/mati.git

Conflicts:
	mati/src/mati/Lisern3.java
ddd