ls
Merge branch 'master' of https://github.com/kuchera/21sh

Conflicts:
	src/fun_ls.c
calculatrice