zaciatky novej fronty
Merge branch 'master' of github.com:FruitOfLight/vida

Conflicts:
	.settings/org.eclipse.jdt.ui.prefs

pokus o merge
tancujuca fronta