First Commit
Merge branch 'master' of git-kavi:ka-vi/flist

Conflicts:
	.gitignore