init
Merge branch 'master' of github.com:magiclud/graLista2

Conflicts:
	.gitignore