home 5
resolve git
Merge branch 'master' of https://github.com/Ajirass/tant-libre

Conflicts:
	.gitignore
home 5