file
Merge branch 'master' of https://github.com/sharamall/peli

Conflicts:
	.gitignore