init
Merge branch 'master' of https://github.com/vkweberti/eleonora

Conflicts:
	.gitignore