stombor adden
stombor adden
Merge branch 'master' of https://github.com/MelicharDaniel/dmelichar

Conflicts:
	README.md
stombor adden