First commit
Merge branch 'master' of https://github.com/pelatimtt/Legian

Conflicts:
	.gitignore